Mini commit, first commit of 3.5.5
Fixed 1.5.2 compatability bug
Merge branch 'master' into LuaDev