Merge stable changes from develop into master