manual sync 02/06

https://github.com/douglascraigschmidt/POSA-14