libinjection sync
Merge pull request #578 from client9/remotes/trunk

libinjection sync to v3.8.0