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

libinjection sync