Merge branch 'hotline'

Conflicts:
	library/Class/WebService/Lastfm.php
3 jobs from master in 75 minutes and 25 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #16834
docker
test:php5_latest

00:39:12

passed #16815
docker
test:php7_latest

00:36:13

failed #16814
docker
test:php5_latest

00:39:45