After fixing merge, add a test to verify it stays fixed
After fixing merge, add a test to verify it stays fixed

graphite-project/whisper,cbowman0/whisper,alexandreboisvert/whisper,deniszh/whisper,penpen/whisper,akbooer/whisper,acdha/whisper,graphite-server/whisper,jjneely/whisper,obfuscurity/whisper,kerlandsson/whisper,piotr1212/whisper