Fix some meganits (#1445)
Fix some meganits (#1445)


daviddrysdale/trillian,Martin2112/trillian,RJPercival/trillian,Martin2112/trillian,gdbelvin/trillian,daviddrysdale/trillian,AlCutter/trillian,AlCutter/trillian,daviddrysdale/trillian,RJPercival/trillian,gdbelvin/trillian,google/trillian,Martin2112/trillian,gdbelvin/trillian,google/trillian