Merge production code as of 123014 into master

Part of the clean-up process