REFS: #407 minor fixes
Merge branch 'biodiv2.0' into wikwio-staging