Merge branch 'master' into feature/provider-support

Conflicts:
	coffee/000_angoolar.tail.coffee
	coffee/modules/090_base_module.tail.coffee