here's my version.
Pre-merge changes
Merge branch 'updates'