Merge branch 'dg/win_icon' into master-pu
Merge branch 'dw/crypto-hmac-enhancements' into master-pu
Merge branch 'vd/code_get_mode' into master-pu
Merge branch 'sal/ftp' into master-pu
Merge branch 'fdm/windows_file_share_delete' into master-pu
Merge branch 'mpu/odbc_autocommit' into master-pu
Merge branch 'lf/snmp-tuple-fun' into master-pu
Merge branch 'lf/snmpm_user_default' into master-pu
Merge branch 'nox/promote-inline_list_funcs' into master-pu
Merge branch 'jd/file-ram-opt-doc' into master-pu
Merge branch 'avi/fix-os-cmd-win' into master-pu
Merge branch 'pn/ansi-console' into master-pu
Merge branch 'ta/werror-return-type' into master-pu
Merge branch 'jv/cover-patches' into master-pu
Merge branch 'rc/break-out-asserts' into master-pu

Conflicts:
	lib/eunit/include/eunit.hrl
Merge branch 'sa/dialyzer-record-field-type' into master-pu
Merge branch 'id/snmp_optimization' into master-pu
Merge branch 'nox/rm-reverse-eta-conversion' into master-pu
Merge branch 'sk/odbc64' into master-pu
Merge branch 'lh/forget-mnemosyne' into master-pu

Conflicts:
	lib/stdlib/src/erl_pp.erl