Merge pundit changed to master

I messed up.  I accidentally accepted the merge request.  So, I reverted that request and am submitting a new one.  Now I won't accept it.