Merge branch 'master'
Bump version
Small patch to load timing
Merge branch 'site/ume'