Merge branch 'release-3.6.x' of github.com:nanoc/nanoc into release-3.6.x