Merge pull request #3625 from slide/master
authorMarek Safar <marek.safar@gmail.com>
Sat, 24 Sep 2016 07:33:19 +0000 (09:33 +0200)
committerGitHub <noreply@github.com>
Sat, 24 Sep 2016 07:33:19 +0000 (09:33 +0200)
Fix 16628


Trivial merge