Merge "master" branch into "db".