Merge branch 'master' into memory

author Oliver Schneider <oli-obk@users.noreply.github.com>

Sat, 26 Aug 2017 21:13:55 +0000 (23:13 +0200)

committer GitHub <noreply@github.com>

Sat, 26 Aug 2017 21:13:55 +0000 (23:13 +0200)
author Oliver Schneider <oli-obk@users.noreply.github.com>
Sat, 26 Aug 2017 21:13:55 +0000 (23:13 +0200)
committer GitHub <noreply@github.com>
Sat, 26 Aug 2017 21:13:55 +0000 (23:13 +0200)
diff --cc src/librustc_mir/interpret/eval_context.rs
Simple merge
author	Oliver Schneider <oli-obk@users.noreply.github.com>
	Sat, 26 Aug 2017 21:13:55 +0000 (23:13 +0200)
committer	GitHub <noreply@github.com>
	Sat, 26 Aug 2017 21:13:55 +0000 (23:13 +0200)