Merge pull request #5294 from LorenaGdL:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 9 Sep 2015 13:41:39 +0000 (13:41 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 9 Sep 2015 13:41:39 +0000 (13:41 +0000)

Trivial merge