Merge pull request #8522 from zongwave:master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Apr 2017 11:40:07 +0000 (11:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Apr 2017 11:40:07 +0000 (11:40 +0000)

Trivial merge