Merge pull request #7806 from alalek:backport_7640
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 7 Dec 2016 14:00:40 +0000 (14:00 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 7 Dec 2016 14:00:41 +0000 (14:00 +0000)
commitcf97e6e00fb019e3421c12f3890b754d9d035c94
treeb4baaf2501bf1ae32a459f88c145de153d433876
parentbc96997410b51bab9fab53498f98b9058abd5aff
parent10d1b33a808f298a0ae0740968145df3179c2ce2
Merge pull request #7806 from alalek:backport_7640