Merge branch '2.4.12.x-prep' into 2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Apr 2016 13:26:12 +0000 (16:26 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 20 Apr 2016 13:26:12 +0000 (16:26 +0300)

Trivial merge