This is the last commit before `master` and `current` were merged.