Merge pull request #7314 from alalek:backport_7266
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 22 Sep 2016 11:28:46 +0000 (11:28 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 22 Sep 2016 11:28:46 +0000 (11:28 +0000)
commit9ff63a46fcfe784e6465320af80624a53a98ccaa
treeee94a6544b45375339a8992217265a993cd30107
parentd68e3502278d6fc5a1de0ce8f7951d9961b20913
parentc314178e7aa06fd4ed84b6521d592ea12e1d6851
Merge pull request #7314 from alalek:backport_7266