Merge branch 'thirdparty_dev' into dev

# Conflicts:
#	source/putty/crypto/ntru.c
#	source/putty/utils/base64_valid.c

Source commit: c2686e2678d9dd65b98c409229d251baab3a6a4d