Merge remote-tracking branch 'upstream/master'

Conflicts:
	LessAssetPipelineGrailsPlugin.groovy
	grails-app/conf/BuildConfig.groovy
	src/groovy/asset/pipeline/less/Less4jProcessor.groovy