Bug 1094064 - More descriptive names for merges
Merge bug_1094064_descriptive_merge_commits into integration-master