Merge branch 'develop'
Dropping the use of the ternary operator in favour of a more backward… … compatible approach to formatting booleans for MailGun