[match-and-simplify] Merge from trunk

[Richard Biener]

2014-10-31  Richard Biener  <rguent...@suse.de>

        Merge from trunk rr216800 through r215940.

        Brings back next merge piece.