Merge master into 2.0

There is a lifecycle change in master that would be helpful to 2.0. It is also about time we merge, it's been 10 days since last.