Backbone 1.1.x support
Merge branch 'hotfix/0.5.2'