Update location of nanoc repository (again)
Merge master branch
Update location of nanoc repository (again)