Manually merge https://github.com/thenewguy/stamps/commit/3c7626e20788dbb8d49c1ab87b93d0b507e73620 and https://github.com/thenewguy/stamps/commit/29dd039ad3686dcaca67a43e920105f1d7b5c8f6 with upstream master