Updated for 3.1.2 SSL
Updated for 3.1.2 SSL
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/test.js
Updated for 3.1.2 SSL