Dependency fixes, supporting #86
Test and fix for #85
Merge branch '2.2'