Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-01-13' into staging