Merge branch 'as3fixes'