Michael 2a56370cf4 Merge remote-tracking branch 'upstream/develop' into annando/issue8514		2020-05-18 21:38:17 +00:00
..
duepuntozero
frio
quattro
smoothly
vier	Issue 8582: "cid" in "network" is now "contactid"	2020-05-17 15:01:27 +00:00