Merge pull request #7727 from alalek:backport_7536
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 26 Nov 2016 08:10:29 +0000 (08:10 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 26 Nov 2016 08:10:29 +0000 (08:10 +0000)
commitf6d5a1dd2c78bd395123c48bc0f6f28abb324d67
tree26dbdbeb29ce63524738a17430d45fceb6a96585
parent979b0ae9ce46b2645e863e99313bae288088a1f8
parent11b642fb8cc342f9f4e33ab0cf8f1383dba5da5d
Merge pull request #7727 from alalek:backport_7536