Revert "Revert "Merge pull request #4631""

This reverts commit dc2a4539862decbbfdb550bac76d61e4d47128e0.

Conflicts:
	spec/config-spec.coffee
	src/config.coffee