[match-and-simplify] Merge from trunk

[Richard Biener]

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

        Merge from trunk r217261 through r217416.

        Brings back next merge piece.

        * match-plusminus.pd: Remove.