Added support for PreparedStatement#setBinaryStream(int, InputStream)
Constant for buffer in StreamWrapper renamed to MAX_MEMORY_BUFFER_BYTES
resolved merge conflicts
Merge branch 'alexismeneses-ISSUE_213'
Merge pull request #237 from davecramer/master

fixed merge errors and test build