Merge https://github.com/systemed/potlatch2