Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'

* maint:
  Change encoding of troublesome notes.xml files to utf-8
  Convert some notes.xml files from latin-1 to utf-8
Merge branch 'maint'

* maint:
  core_lint: Correct the type error() to conform to the code
Merge branch 'maint'

* maint:
  Correct documentation of predefined and built-in types
Merge remote-tracking branch 'upstream/maint'
Merge remote-tracking branch 'upstream/maint'
Merge branch 'maint'
Merge branch 'maint'

Conflicts:
	erts/preloaded/ebin/erlang.beam
Merge branch 'maint'
Add misc documentation
Merge branch 'peppe/common_test/misc_r16b02_docs' into maint

* peppe/common_test/misc_r16b02_docs:
  Add misc documentation

OTP-11272
OTP-11263
OTP-11244
OTP-11238
OTP-11176
Merge branch 'maint'
Make builtin hook respond to init:stop
Merge branch 'peppe/common_test/init_stop_problem' into maint

* peppe/common_test/init_stop_problem:
  Make builtin hook respond to init:stop

OTP-11175
Merge branch 'maint'
crypto: Add ticket for 5d8a13bb6a180e0a

OTP-11320
Correct documentation of predefined types

The documentation of predefined types has been corrected

Thanks to Kostis Sagonas.