Prepare for merge with master.
Merge master branch.