Fix compilation with Mono 3.0
Merge commit '8e937de7bd6e70253c39a49b526fe1086e29d25c'