Merge branch 'master' into afsk_com
Merge branch 'afsk_com' of ssh://sm3xik.sk3w.se/home/sysop/svxlink into afsk_com