stable merge

merge stable build to master