Merge branch 'thirdparty_dev' into dev

# Conflicts:

#	libs/openssl/include/openssl/opensslv.h

Source commit: 294eff201ef3f10cea9045ad3a26fb1b1134be06