Merge master -> stable.