Merge branch 'serial-from-alan'