Merge branch 'experimental-4.x' of github.com:nanoc/nanoc into experimental-4.x