Merge branch 'develop'
Merge branch 'develop'
For musicbox 0.4.3, Mopidy 0.15+
Merge branch 'master' into develop