clarified semantics
auto-merge staging into master