master
Merged gsoc-ssh branch. Closes #910
Update zlib to 1.3.2. Fixes #3282
Upgrade included zlib to 1.2.11