Merge remote-tracking branch 'remotes/kraxel/tags/pull-fwcfg-20150414-1' into staging