Manually merging in the latest changes from schotime-npoco-dev2.0