Unity 4.5 -> Unity Staging

Merge fixes in 4.5 branch into trunk based staging branch.