Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-01-19' into staging