Merge branch 'maint'

* maint:
  Update primary bootstrap
  Eliminate incorrect get_stacktrace/0 warning

Conflicts:
	bootstrap/bin/start.boot
	bootstrap/bin/start_clean.boot
	bootstrap/lib/compiler/ebin/beam_utils.beam
	bootstrap/lib/compiler/ebin/beam_validator.beam
	bootstrap/lib/compiler/ebin/sys_core_fold.beam
	bootstrap/lib/kernel/ebin/error_logger.beam
	bootstrap/lib/kernel/ebin/file_server.beam
	bootstrap/lib/kernel/ebin/global.beam
	bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
	bootstrap/lib/kernel/ebin/kernel.appup
	bootstrap/lib/kernel/ebin/net_kernel.beam
	bootstrap/lib/kernel/ebin/user_drv.beam
	bootstrap/lib/stdlib/ebin/c.beam
	bootstrap/lib/stdlib/ebin/dets.beam
	bootstrap/lib/stdlib/ebin/dets_utils.beam
	bootstrap/lib/stdlib/ebin/edlin.beam
	bootstrap/lib/stdlib/ebin/erl_lint.beam
	bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
	bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
	bootstrap/lib/stdlib/ebin/escript.beam
	bootstrap/lib/stdlib/ebin/ets.beam
	bootstrap/lib/stdlib/ebin/gen_event.beam
	bootstrap/lib/stdlib/ebin/gen_fsm.beam
	bootstrap/lib/stdlib/ebin/gen_server.beam
	bootstrap/lib/stdlib/ebin/gen_statem.beam
	bootstrap/lib/stdlib/ebin/otp_internal.beam
	bootstrap/lib/stdlib/ebin/proc_lib.beam
	bootstrap/lib/stdlib/ebin/qlc.beam
	bootstrap/lib/stdlib/ebin/shell.beam
	bootstrap/lib/stdlib/ebin/slave.beam
	bootstrap/lib/stdlib/ebin/string.beam
	bootstrap/lib/stdlib/ebin/supervisor.beam

0 files changed, 0 insertions, 0 deletions