merging fix from github.com/ryanb/cancan/pull/917