DDBEASY-246 - Addiotional upsteam merge fixes.
Merge remote-tracking branch 'origin/DDBEASY-246' into development

Conflicts:
	sass/ddbasic.scss