Fix nextCommands
Merge branch 'newrules' into 2
Bump up version to 2.5.1 for next release
Merge tag '2.5.1' into release