regenerate About page from master branch
regenerate Migration page from master branch
apply most minor changes from master branch
apply skippy changes from master branch
apply example tweaks from master branch
apply fixes from master branch to example templates