Fix ordering. 'AA' needs to come after 'Z', not 'A'.
Merge branch 'master' into ballotpicker

Conflicts:
	Rakefile