[match-and-simplify] Merge from trunk

[Richard Biener]

Committed.

2015-01-12  Richard Biener  <rguent...@suse.de>

        Merge from trunk r218478 through r219383.