Merge security/openssl 1.0.1h back to 2013Q3.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3

Conflicts:
	security/openssl/Makefile
	security/openssl/distinfo
	security/openssl/patches/patch-Makefile.org
	security/openssl/patches/patch-apps_Makefile
	security/openssl/patches/patch-tools_Makefile
Update 'joyent' and 'wip' submodules.