Merge pull request #6485 from vagran:vagran-patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 31 May 2016 10:58:18 +0000 (10:58 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 31 May 2016 10:58:18 +0000 (10:58 +0000)

Trivial merge