Merge branch 'develop' of github.com:ellzey/libevhtp into develop