Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20140916-1' into staging