Fix 2.10 build
Merge pull request #155 from phaller/topic/210-build

Fix 2.10 build