Merge the 2.10 and 2.11 branches in one unified build.

Fixes #249.