Merge pull request #4153 from stefan-cornelius:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 30 Jun 2015 06:12:03 +0000 (06:12 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 30 Jun 2015 06:12:03 +0000 (06:12 +0000)

Trivial merge