Merge changes from nanoc (up to 3080245634acffbb22bc0b7275a01a4165819750)