adding cross build support for 2.10.4 and 2.11.2
Merge branch 'hotfix/0.2.1'