Merge branch '14.0-port-142' of git+ssh://github.com/efatto/server-ba…

Merge branch '14.0-port-142' of git+ssh://github.com/efatto/server-ba… #675