Merged with maxmenten/master.
Finalised merge with twostars/snoxd-koserver, both branches are now in sync