Update to 3.12 from http://wordpress.org/extend/plugins/user-role-editor/
Merge branch '3.12'