Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw-cfg-20151217-1' into staging