Merge branch 'release-0.6.0'
Merge branch 'release-0.6.1'
Merge remote-tracking branch 'upstream/master' into tally_trigger