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

libinjection sync v3.4.1