Merge master to stable.