Update the "master"

Ensure that the "master" branch has all of the bug and functionality fixes.