Merge branch 'maint'
Merge branch 'sverk/hipelibs-code_server-crash'

* sverk/hipelibs-code_server-crash:
  kernel: Disable hipe compilation for hipe_unified_loader
Merge branch 'maint'
Merge branch 'maint'

* maint:
  Fix chunk usage check
Merge branch 'maint'

* maint:
  Fix compilation of examples and tc names on windows
  Create erl.ini for host emulator
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'

* maint:
  Ignore calls to wx* modules if it is undefined
  Fix erl_interface testcases
  Update gccifier to respect -link option
  Extand timetrap for escript tests
  Fix compilation issues on windows and Ubuntu 12.04
  Ignore common_test bootstrap
Merge branch 'maint'

* maint:
  Fix infinite loop when an invalid drive letter it given
Merge branch 'maint'
Merge branch 'maint'

* maint:
  Bug fixes and improvements of dialyzer_typesig
Merge branch 'maint'

* maint:
  Remove stale code for hybrid heap and incremental GC
  Remove the hipe_bifs:show_message_area/0 BIF
  Remove support for erlang:system_info(global_heaps_size)
  Remove the erlang:garbage_collect_message_area/0 BIF
  Remove workarounds for hybrid and shared heaps in test suites

Conflicts:
	erts/doc/src/erlang.xml
	erts/emulator/beam/erl_message.c
	erts/emulator/beam/erl_process.c
	erts/emulator/beam/erl_process.h
	erts/emulator/hipe/hipe_bif2.tab
	lib/hipe/cerl/erl_bif_types.erl
Remove Erlang-specific compilation error regexp

The purpose of this regexp is to ensure that, when invoking the Erlang
compiler inside Emacs through M-x compile, any error messages be
turned into links jumping to the right line in the right source file.
However, it seems like this works out of the box in modern Emacsen,
and furthermore, using a non-standard regexp inhibits jumping to a
certain column when this is provided by the compiler.
Merge branch 'maint'
Merge branch 'maint'

* maint:
  Update to work with space in include path
  Update to work with whitespace in exec path
Add kernel/test/code_SUITE:upgrade

For now we only test beam as hipe doesn't pass the test
Remove the deprecated inviso application
Merge branch 'maint'

* maint:
  Improved handling of multiple closes
Merge remote branch 'upstream/maint'

* upstream/maint:
  ssl: Test case fixes
  ssl: Avoid second bottleneck in supervisor
  ssl: File handling optimization
  ssl: Simpler PEM cache
  ssl: Refactored for readability
  ssl: Use md5 as file ref id instead of filenames
  ssl: Move ets:select bottleneck in server
  ssl: Renegotiate updates session id in gen_fsm state
  ssl: Use ordered_set in cache
  ssl: Move and avoid ets:select bottleneck in client
  ssl: Reuse session check optimization
  ssl: Avoid supervior bottleneck