Unity 4.3 compatibility pass
Merge pull request #294 from Fenrisul/master

Unity 4.3 compatibility pass