sync slp.patch with upstream
Merge pull request #588 from lslezak/slp_sync

sync slp.patch with upstream