MYLOC-60 - Fixing LESS
Merge origin/master