Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-07-13' into staging