Merge pull request #3969 from Dikay900:master_to_2_4
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 4 May 2015 10:13:44 +0000 (10:13 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 4 May 2015 10:13:45 +0000 (10:13 +0000)

Trivial merge