Merge master.
Prepare latest version.