Qt version to attempt get around Gtk Indicator limitations
Merge remote-tracking branch 'origin/master'