Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-08-27-v2' into...