Issue 662

Merging PostSharp update