merge stable branch updates into master