Merge branch 'master' into extended-dependency

Conflicts:
	GwtGrailsPlugin.groovy
	scripts/_GwtInternal.groovy