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

libinjection sync to v3.6.0