Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-04-28' into staging