Merge 13w42 fixes into master to maintain latest source code on a single branch "master"

Merge 13w42-fixes into master , which will maintain single branch of code for latest source code