Merge remote-tracking branch 'upstream/master'

latest commit 486a0cc0d9
mnlipp authored