Merge branch 'issue697' into 1.6.x
Merge branch 'issue697' into 1.6.x
improve logging of less4j warnings
Merge branch 'issue704' into 2.0.x