Merge pull request #3016 from fradelg:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 13:50:35 +0000 (13:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 13:50:35 +0000 (13:50 +0000)

Trivial merge