Merge changes from nanoc (up to 212e96dd61038cebf5d86bfb69c36bd99de975cb)