Merge remote-tracking branch 'refs/remotes/origin/master' into master-2
Merge branch 'master' of github.com:aerys/minko-obj