Merged everything from the master branch.