Merge branch 'develop' of https://github.com/eMusik/emusik into develop

* 'develop' of https://github.com/eMusik/emusik:
Merge branch 'develop' of https://github.com/eMusik/emusik into develop

* 'develop' of https://github.com/eMusik/emusik: