Pull in fixes for Cinnamon 2.4

This pulls in the changes I made to make this work with Cinnamon 2.4.