Less compiler base64 encoding
Merge remote-tracking branch 'origin/master'