[match-and-simplify] Merge from trunk

[Richard Biener]

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

        Merge from trunk r216772 through r216799.

        Brings back next merge piece.