Merge branch 'master' of github.com:blackline/backbone-inheritance