[match-and-simplify] Merge from trunk

[Richard Biener]

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

        Merge from trunk r216941 through r217074.

        Brings back next merge piece.