Merge branch 'master' into libstd

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

Thu, 24 Aug 2017 13:30:35 +0000 (15:30 +0200)

committer GitHub <noreply@github.com>

Thu, 24 Aug 2017 13:30:35 +0000 (15:30 +0200)
author Oliver Schneider <oli-obk@users.noreply.github.com>
Thu, 24 Aug 2017 13:30:35 +0000 (15:30 +0200)
committer GitHub <noreply@github.com>
Thu, 24 Aug 2017 13:30:35 +0000 (15:30 +0200)
diff --cc src/librustc_mir/interpret/eval_context.rs
Simple merge
author	Oliver Schneider <oli-obk@users.noreply.github.com>
	Thu, 24 Aug 2017 13:30:35 +0000 (15:30 +0200)
committer	GitHub <noreply@github.com>
	Thu, 24 Aug 2017 13:30:35 +0000 (15:30 +0200)