Pulled files from master branch that I didn't modify for 1.4.7