[match-and-simplify] Merge from trunk

[Richard Biener]

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

        Merge from trunk r216543 through r216631.

        Brings back second merge piece.