Dev is ready for a merge into master me-thinks.