Merge branch 'issue805' into 1.7.x
add singlelineStripper processor to SPI
fix merge conflicts