Upstream changes from https://github.com/awheeler/whiskerboard