Merge remote-tracking branch 'mjb/altoslib_mjb'