Merge branch 'master' of ssh://webmasters.boum.org/~/wiki