Merge remote-tracking branch 'upstream/master' into clean
Merge remote-tracking branch 'upstream/master' into clean
prioritize button to match freeze button in gtk gui
Merge pull request #392 from wozz/gtk

Gtk update