Merge pull request #4063 from Dikay900:2_4_to_master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 28 May 2015 14:49:13 +0000 (14:49 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 28 May 2015 14:49:13 +0000 (14:49 +0000)

Trivial merge