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