Merged in the changes from the master branch