Hopefully fixed problems from yesterday's commit.
Authored by: skull5 2012-10-20
Parent: [r21444]
Child: [r21446]