Merged scdl_fixes branch into master.