Merge branch '4.2' into 4.3

* 4.2:
  Add weeks in the options 'labels'

Author: javiereguiluz

reference/forms/types/dateinterval.rst

@@ -143,6 +143,7 @@ are ``null``, so they display the "humanized version" of the child names (``Inve
         'invert' => null,
         'years' => null,
         'months' => null,
+        'weeks' => null,
         'days' => null,
         'hours' => null,
         'minutes' => null,