Merge remote-tracking branch 'upstream/master' into split-browser

Conflicts:
	src/MacVim/MMBackend.m
	src/MacVim/MacVim.h
	src/MacVim/MacVim.m
	src/testdir/Make_amiga.mak
	src/testdir/Make_dos.mak
	src/testdir/Make_ming.mak
	src/testdir/Make_os2.mak
	src/testdir/Make_vms.mms
	src/testdir/Makefile
	src/testdir/test3.in
	src/testdir/test3.ok
	src/testdir/test62.in
	src/testdir/test62.ok
	src/testdir/test77.in
	src/testdir/test85.in
	src/testdir/test85.ok
	src/testdir/test86.in
	src/testdir/test86.ok
	src/testdir/test87.in
	src/testdir/test87.ok
Merge pull request #77 from stanlemon/split-browser

Latest from b4winckler merged into split-browser
Merge branch 'alloy-split-browser' into split-browser

Conflicts:
	src/MacVim/MMBackend.m
	src/MacVim/MacVim.h
	src/MacVim/MacVim.m
	src/testdir/Make_amiga.mak
	src/testdir/Make_dos.mak
	src/testdir/Make_ming.mak
	src/testdir/Make_os2.mak
	src/testdir/Make_vms.mms
	src/testdir/Makefile
	src/testdir/test3.in
	src/testdir/test3.ok
	src/testdir/test62.in
	src/testdir/test62.ok
	src/testdir/test77.in