Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-06-09' into staging