back to 2.0
add comments about .net 4.0 crash
Merge remote-tracking branch 'upstream/master'