forward Smallest Federated Wiki
Merge branch 'master' into ward/page-update

Conflicts:
	default-data/pages/smallest-federated-wiki
Merge branch 'ward/page-update'