4.3: ready to merge
Merge remote-tracking branch 'origin/master'
4.3: bugfix