Fossil SCM
Merge fixes from trunk.
Commit
a5d80522bdd307680e0934d517eb24bb372f4acab9ce2c984bce1440b85a25bf
Parent
d2a94aa96c78ede…