Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-20150219-1' into staging