Merge branch '4.4' into 5.0

* 4.4:
  Added choices to message parameters

Author: javiereguiluz

reference/constraints/Choice.rst

@@ -333,11 +333,12 @@ choices.
 
 You can use the following parameters in this message:
 
-===============  ==============================================================
-Parameter        Description
-===============  ==============================================================
-``{{ value }}``  The current (invalid) value
-===============  ==============================================================
+=================  ============================================================
+Parameter          Description
+=================  ============================================================
+``{{ choices }}``  A comma-separated list of available choices
+``{{ value }}``    The current (invalid) value
+=================  ============================================================
 
 min
 ~~~