Fix jade error
Merge branch 'master' into switching-to-mpd