Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20171023-pull-request' into...