Merge stable master into stable.

v3.0.0-SNAPSHOT is stable.