Merge remote-tracking branch 'bbatsov/master' into bbatsov-master
Merge branch 'bbatsov-master'