[match-and-simplify] Merge from trunk

[Richard Biener]

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

        Merge from trunk r216394 through r216542.

        Brings back infrastructure merge.