Merge git://git.samba.org/jelmer/ikiwiki