Various..
Merge branch 'master' of 100tb.nostdal.org:/home/fod/nostdal-stuff