Bug fix from the bug-fix branch
One more commit
Merge remote-tracking branch 'refs/remotes/origin/bug-fix'