Merge branch 'issue536' into 1.7.x
update less4j to 1.1.2
Merge branch 'less4jUpdate' into 2.0.x