4. Please squash all commits for a change into a single commit (this can be
     done using `git rebase -i`). Do your best to have a
     [well-formed commit message][] for the change.

[Java style guide]: https://google.github.io/styleguide/javaguide.html
[well-formed commit message]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

#### Merging pull requests ####