resolves #119
Merge branch 'v5-0-1-b6' into prepare_playlist