Brings back the last stage1 merge. I'll followup on the trunk status of match-and-simplify on monday - development will now continue on the branch.
Richard. 2014-11-14 Richard Biener <[email protected]> Merge from trunk r217546 through r217560. Brings back next merge piece.
