fix 2.6
Merge branch 'master' of github.com:rmcgibbo/osprey