fix master (#393)
fix master (#393)


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