Merging unity-4.3-stating into unity-trunk