Merge branch '2.4.8.x-prep' into 2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 19 Jun 2015 11:54:18 +0000 (14:54 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 19 Jun 2015 11:54:18 +0000 (14:54 +0300)

Trivial merge