Cherry picked unity-trunk fixes for Unity 4.5