merge from bbatsov:master

merge from bbatsov:master