WIP
WIP
Merge branch 'master' into gnome_keyring_stuff
Simplify requirements on some units