branch: master after bugfix and ready for release
Merge branch 'master' into f2