Merge branch 'spotify'
Authored by: Jean-Francois Dockes 2018-09-01
Parent(s): [40e35b][c44069]
Child(ren): [6ce759]