Reverted commit e383fe8 as it got rejected upstream in favor of dalcde@af1748f
Merge branch 'master' of https://github.com/wisheu/Cinnamon