Merge remote-tracking branch 'remotes/armbru/tags/pull-hw-2015-04-02' into staging