Fix error in merge commit
Fix error in merge commit

pjskennedy/mail,EdwardPantoja/mail,jeremy/mail,schepedw/mail,kjg/mail,missive/mail,schepedw/mail,agaridata/mail,carsonreinke/mail,agaridata/mail,smallspark/mail,carsonreinke/mail,kert-io/mail,smallspark/mail,pushrax/mail,benmmurphy/mail,EdwardPantoja/mail,benmmurphy/mail,kainlite/mail,jeremy/mail,kaineer/mail,kaineer/mail,jonkgrimes/mail,owenr/mail,schneems/mail,zacholauson/mail,yujinakayama/mail,0x00evil/mail,Schniz/mail,pascalbetz/mail,pjskennedy/mail,schneems/mail,pushrax/mail,kert-io/mail,0x00evil/mail,jonkgrimes/mail,wktk/mail,mikel/mail,planio-gmbh/mail,zacholauson/mail,jeremyevans/mail,jeremyevans/mail,kjg/mail,wktk/mail