DF Fixed problem with scale validator in resources.
Merge remote-tracking branch 'origin/master'