Merge "Avoid ResourceLoader LESS parsing bug"