Test merge commit message.

---
Squash commit from https://github.com/ndahlquist/Whaler/pull/7 created by Whaler.