Merge changes in the master branch into 0.99.5 preparation branch.