Merge commit '5a990196f8' into develop

Conflicts:
	moment.js

diff --cc moment.js
index 9d67f90c1565a2e1ec7081b70c874ab91ec43a9c,12ae51f485870f504f36980ccc5e3940bb7168e1..e0148161c81e105d0820325daab5f5b381a23469
--- 1/moment.js
--- 2/moment.js
+++ b/moment.js
@@@ -42,7 -34,8 +35,8 @@@
          parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999
          parseTokenThreeDigits = /\d{3}/, // 000 - 999
          parseTokenFourDigits = /\d{1,4}/, // 0 - 9999
 -        parseTokenWord = /[0-9]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i, // any numbers followed by word characters
+         parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999
 +        parseTokenWord = /[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+\s*?[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i, // any word (or two) characters or numbers. Added \s*?... to match arabic two word month.
          parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z
          parseTokenT = /T/i, // T (ISO seperator)