Rebased from https://github.com/linuxmint/Cinnamon/pull/1293
fixed indentation problem
Merge pull request #1514 from rayza/master

Rebased from #1293