Merge pull request #3550 from JoeHowse:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 30 Dec 2014 11:10:02 +0000 (11:10 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 30 Dec 2014 11:10:02 +0000 (11:10 +0000)

Trivial merge