Merge pull request #3543 from MatMoore:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 Dec 2014 12:11:42 +0000 (12:11 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 Dec 2014 12:11:42 +0000 (12:11 +0000)

Trivial merge