Merge remote branch 'upstream/maint'
Merge remote branch 'upstream/maint'
Merge branch 'bjorn/erts/fix-trace-pattern'

* bjorn/erts/fix-trace-pattern:
  Make sure that turning off local trace does not turn off global trace
  erl_bif_trace: Remove an unused variable
Merge branch 'maint'
Merge remote branch 'upstream/maint'
Merge branch 'maint'

* maint:
  Document that CTHs can get fail/skip as Config
  Ignore calls to dialyzer_timing when checking deprecated
  Do not verify del_path as it is not always there
  Fix broken links
  Generate <a name="name"> tags in edoc xml headings
  Fix compile warning
  crypto: Fix buffer overflow bug in rsa_sign
  crypto: Skip some tests if openssl lib < 0.9.8
  Fix boken spec
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'

Conflicts:
	lib/diameter/autoconf/vxworks/sed.general
	xcomp/README.md
erts: Remove some compiler warnings
erts: Refactor code loading to use erts_schedule_thr_prgr_later_op
erts: Allow thr_prgr_later_op to reschedule

and reuse the same ErtsThrPrgrLaterOp
erts: Refactor tracing to use erts_schedule_thr_prgr_later_op
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'
erts: Refactor naming regarding code_write_permission

The concept of code_write_permission is used by tracing as well
and is not specific to code_ix.
Merge branch 'maint'
Merge branch 'maint'