Merge branch '2.4.10.x-prep' into 2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 5 Aug 2015 13:20:12 +0000 (16:20 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 5 Aug 2015 13:20:12 +0000 (16:20 +0300)

Trivial merge