B2share next merge with master

Merge b2share-next development with master branch.