Less4j now process import statements
Merge branch '1.7.x' into issue845
fix failing test
Merge branch 'issue845' into 1.7.x