Merge in pull 647 by @andhapp to ryanb/cancan 2.0 branch repo;