Merge branch 'fiatjaf-master'
handling uppercased 'Email' keyword