Apply changes for Unity 4.5
Merge branch 'upgrade_unity4.5'