Merge pull request #4118 from petertiedemann/fix-bug-48516
authorJoão Matos <joao@tritao.eu>
Tue, 20 Dec 2016 20:38:03 +0000 (20:38 +0000)
committerGitHub <noreply@github.com>
Tue, 20 Dec 2016 20:38:03 +0000 (20:38 +0000)
Fix bug 48516


Trivial merge