Merge branch '4.4' into 5.1

* 4.4:
  Minor tweak
  Update authentication.rst

Author: javiereguiluz

components/security/authentication.rst

@@ -197,7 +197,8 @@ Creating a custom Password Encoder
 There are many built-in password encoders. But if you need to create your
 own, it needs to follow these rules:
 
-#. The class must implement :class:`Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface`;
+#. The class must implement :class:`Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface`
+   (you can also extend :class:`Symfony\\Component\\Security\\Core\\Encoder\\BasePasswordEncoder`);
 
 #. The implementations of
    :method:`Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface::encodePassword`