More descriptive names.
Merge branch 'master' of github.com:dkorolev/tailproduce
Merge remote-tracking branch 'upstream/jul29_milestone'