Merge branch 'aprs' into 'master'