backport devel/SDL from 2014Q2