Scale only if no width/height set.
Merge remote-tracking branch 'origin/scale_only_if_needed' into philip_master

Conflicts:
	build/srcset.min.js