the proposed branch fixes build failures in Jenkins, that are caused
by our build system refreshing the wiki (uh, twice) *before* merging
the base branch.
Please review'n'merge into stable and devel (the earlier it's done,
the less Jenkins build failure noise we'll get :)