3.1.2 release
3.1.3 release
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pkcs5pkey-1.0.js