Merge branch 'upstream/master'
wrong parameter order in ltrim breaks functionality
revert ignores
Merge pull request #1035 from rixbeck/master

Wrong parameter order in ltrim() breaks functionality