Merge branch 'develop' of git://github.com/mopidy/mopidy.git into soundcloud_backend
Fix: Double class, super methods