Merge branch 'rails-4.2' of https://github.com/zwippie/cancannible into rails-4.2
Merge branch 'rails-4.2' of https://github.com/zwippie/cancannible into rails-4.2