Merge branch 'release/0.18' into develop
Fix bug in str_bs, where last piece was added twice
Merge branch 'hotfix/0.18.1' into develop
Adapt/fixed Yihui's proposal for str_bs
Merge branch 'release/0.18.2'