Fixes issue with role deletion.
Merge commit 'f0f249dc46dec519a67d2d9411a17c70afd3490f' into HEAD