Update code from upstream
Fix for Cinnamon 2.4