Merge pull request #6404 from solosuper:bugfix/issue6315
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Apr 2016 14:27:58 +0000 (14:27 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Apr 2016 14:27:59 +0000 (14:27 +0000)

Trivial merge