Merge branch 'issue536' into 1.7.x
update less4j to version 1.1.3
Merge branch 'less4jupdate' into 2.0.x