[match-and-simplify] Merge from trunk r211444

[Richard Biener]

Bootstrapped on x86_64-unknown-linux-gnu.

Richard.

2014-06-11  Richard Biener  <rguent...@suse.de>

        Merge from trunk r208477 through r211444.