Catchup

This merge brings the fork up to date