Verify branch integrity.
Verified branch integrity.
Clean up after merge.
Merge branch 'Hubert'
Merge branch 'master' into templating