My next check in may break the build

[Justin Mclean]

Hi,

Just about to check in some changes that might break the build on Mac/Windows - 
that should be a clue to what the check in is :-). If it does break I'll fix it 
quickly.

Thanks,
Justin