[match-and-simplify] Merge from trunk

[Richard Biener]

Committed.

Richard.

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

        Merge from trunk r216632 through r216771.

        Brings back third merge piece.