Merge pull request #2780 from hbadino:Feature_3692_2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 19:00:52 +0000 (19:00 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 19:00:52 +0000 (19:00 +0000)

Trivial merge