Add two unexplained code changes made by a mysterious space traveller that were present on Chloe's source root
Merge branch 'master' into RELEASE_20140325