Follow up r1031
Merge branch 'master' of https://github.com/idathena/trunk