Unity extension fixes for 4.5
Merge branch 'master' into feature/appman