Merge pull request #9936 from ryanfox:patch-5
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 27 Oct 2017 11:08:44 +0000 (11:08 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 27 Oct 2017 11:08:44 +0000 (11:08 +0000)

Trivial merge