Events now keep track of the ballot ASExpressions as well as the nonces
Merge remote-tracking branch 'origin/master'