Merge pull request #7879 from alalek:backport_7852
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Dec 2016 13:19:58 +0000 (13:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Dec 2016 13:19:58 +0000 (13:19 +0000)
commitc7ae26bf24812982b039b43a2d3516dcff1aa232
treee2f128aa59ef6a42d4a48510bf729473ebe672f1
parent22df206e1f784fe96805aa885890546283862ef4
parent8444c2380371c8f27cf906ab419aeb12667bac30
Merge pull request #7879 from alalek:backport_7852