REFS: #255
Merge branch 'biodiv2.0' into wikwio-staging