libinjection v3.3.0 sync
Merge pull request #128 from client9/remotes/trunk

libinjection v3.3.0 sync