Merged latest code from the master branch.