Fixed issue with clearing.
Merge branch 'SWC-168'

Conflicts:
	gruntfile.js