#644 - Fixed up broken build
Merge branch '644-cleaner-log' of git://github.com/simong/Hilary into 644-cleaner-log