039.04 Merge tinyg code; jogging - mostly back-porting to TinyG