This is a manually created single commit to incorporate the changes in
https://github.com/Subsurface-divelog/subsurface/pull/502Closes#502
[Dirk Hohndel:]
I was able to manually merge that branch but it created a complete mess
out of the tree and brought several dozen commits in a second time, so
I gave up and instead created this single commit.
Signed-off-by: Philippe Massart <philippe@philmassart.net>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
9dd8726d12