sync with upstream. sdldrop
buildfix