Upgrade to 2.11, cross-compile for 2.10