Merged changes from SVN
Merge branch 'master' of github.com:haxenme/NME