Updated with Unity 4.2.1