Merge branch 'develop'
Merge branch 'develop' of bitbucket.org:zxtune/zxtune
Merge branches master and develop to keep linear history.