to .net 4.0
Merge branch 'master' into MonoDevelop-4.0