Merge master into '450-new-settings-rewrite'

Conflicts:
  - PerformBackup.java
  - Settings.java

src/test/java/fr/xephi/authme/security/PasswordSecurityTest.java

@@ -11,7 +11,6 @@ import fr.xephi.authme.util.WrapperMock;
 import org.bukkit.event.Event;
 import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
@@ -25,7 +24,6 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;

src/test/java/fr/xephi/authme/util/UtilsTest.java

@@ -186,7 +186,6 @@ public class UtilsTest {
     }
 
     // Note: This method is used through reflections
-    @SuppressWarnings("unused")
     public static Player[] onlinePlayersImpl() {
         return new Player[]{
             mock(Player.class), mock(Player.class)