fix compilation bug
Merge branch 'master' into MonoDevelop-4.0