[PATCH][match-and-simplify] Merge from trunk

[Richard Biener]

Committed.

Richard.

2014-08-21  Richard Biener  <rguent...@suse.de>

        Merge from trunk r213754 through r214265.