Fixes nested ability conditions in issue #859
Merge branch 'master' of https://github.com/ricec/cancan