Merge pull request #3510 from boaz001:feature-4057
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:27:33 +0000 (10:27 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:27:33 +0000 (10:27 +0000)

Trivial merge