CHANGELOG updated.
Merged r8166 from trunk.
Backported r8168 from trunk.
Removed useless routes.
Makes assertion compatible with ruby1.9.
ruby1.9: macro must accept 2 arguments.