Merge pull request #1 from cbojar/master

Pull in fixes for Cinnamon 2.4.