Merge remote-tracking branch 'mjb/altosdroid'