Merge branch 'master' of git://ikiwiki.branchable.com