Merge branch 'master'

diff --cc Releasing
Simple merge

diff --cc altoslib/AltosConfigData.java
Simple merge

diff --cc altosui/Makefile.am
Simple merge

diff --cc altosui/altos-windows.nsi.in
Simple merge

diff --cc src/kernel/ao_telemetry.c
Simple merge