Merging latest changes from master into cleanup branch.
Merging latest changes from master into cleanup branch.

js-montreal/docpad.js-montreal.org,js-montreal/docpad.js-montreal.org,js-montreal/docpad.js-montreal.org