Update my branch from original

Merge master to my fork, testing Github web.

This is not a PR to master of timeoverflow