upstream/1.47-patch1

Bas Couwenberg

@sebastic

69114690 · Imported Upstream version 1.47-patch1 · Feb 16, 2017

Upstream version 1.47-patch1