Merged master into branch

With a "nothing" commit of the .db3, just so we know where it happened
in time.