Merging into master. Stable.