[match-and-simplify] Merge from trunk

[Richard Biener]

2014-12-02  Richard Biener  <rguent...@suse.de>

        Merge from trunk r217561 through r218261.