Added lstrip skipping
Merge branch 'master' into pako-devel