Fix WCF 2.1 compatibility
Merge branch '3.0.x'