Merge branch 'gbl' into mips64-gbl

Conflicts:
	src/mips/assembler-mips.cc
	src/mips/disasm-mips.cc
	src/mips/macro-assembler-mips.cc
	src/mips/simulator-mips.cc