Index: src/includes/admin/users.php
===================================================================
--- src/includes/admin/users.php	(revision 5935)
+++ src/includes/admin/users.php	(working copy)
@@ -42,6 +42,8 @@
 	 */
 	function setup_actions() {
 
+		global $wp_version;
+
 		// Bail if in network admin
 		if ( is_network_admin() ) {
 			return;
@@ -52,9 +54,14 @@
 
 		// WordPress user screen
 		add_action( 'restrict_manage_users',      array( $this, 'user_role_bulk_dropdown' )        );
-		add_filter( 'manage_users_columns',       array( $this, 'user_role_column'        )        );
-		add_filter( 'manage_users_custom_column', array( $this, 'user_role_row'           ), 10, 3 );
 
+		// In WordPress >= 4.4, all roles are listed in the table so we don't need the additional columns.
+		$wp_major_version = substr( $wp_version, 0, 3 );
+		if( version_compare( $wp_major_version, 4.4, '<' ) ){
+			add_filter( 'manage_users_columns',       array( $this, 'user_role_column'        )        );
+			add_filter( 'manage_users_custom_column', array( $this, 'user_role_row'           ), 10, 3 );
+		}
+
 		// Process bulk role change
 		add_action( 'load-users.php',             array( $this, 'user_role_bulk_change'   )        );
 	}
@@ -127,7 +134,7 @@
 	 */
 	public static function user_role_bulk_dropdown() {
 
-		// Bail if current user cannot promote users 
+		// Bail if current user cannot promote users
 		if ( ! current_user_can( 'promote_users' ) ) {
 			return;
 		}
@@ -182,7 +189,7 @@
 		// Bail if nonce check fails
 		check_admin_referer( 'bbp-bulk-users', 'bbp-bulk-users-nonce' );
 
-		// Bail if current user cannot promote users 
+		// Bail if current user cannot promote users
 		if ( ! current_user_can( 'promote_users' ) ) {
 			return;
 		}
@@ -200,7 +207,7 @@
 			}
 
 			// Set up user and role data
-			$user_role = bbp_get_user_role( $user_id );			
+			$user_role = bbp_get_user_role( $user_id );
 			$new_role  = sanitize_text_field( $_REQUEST['bbp-new-role'] );
 
 			// Only keymasters can set other keymasters