Merge branch 'master' into testing
oops
Bug fixes to search and favourites
misc
Misc
Merge branch 'testing'