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