Merge branch 'jd/gitolite'