tweaks
Merge branch 'rebuild' into gh-pages