Merge branch '5.3' into 5.4

* 5.3:
  Limit test to ICU 49
  Remove executable bit from files

diff --cc ext/intl/collator/collator_class.c
index d1fa10ef2c7c71218414b1eb103cc71bfa9c1c50,38b2e978ce9f6f634ffeadabc913277b802b2ba8..d1fa10ef2c7c71218414b1eb103cc71bfa9c1c50
mode 100755,100644..100644
--- 1/ext/intl/collator/collator_class.c
--- 2/ext/intl/collator/collator_class.c
+++ b/ext/intl/collator/collator_class.c

diff --cc ext/intl/common/common_error.c
index a0ee7c145ffd54b6fa75395b9ba3b3b1fad4f58b,3ab7fdfbdd5d3ae9e8effaad33a2d7547a267890..a0ee7c145ffd54b6fa75395b9ba3b3b1fad4f58b
mode 100755,100644..100644
--- 1/ext/intl/common/common_error.c
--- 2/ext/intl/common/common_error.c
+++ b/ext/intl/common/common_error.c

diff --cc ext/intl/config.m4
index 0477c7f59dd02d56697597938c5d71504e96221b,dc235db08c81fb2728d142b41b5b1f6dc52708b4..0477c7f59dd02d56697597938c5d71504e96221b
mode 100755,100644..100644
--- 1/ext/intl/config.m4
--- 2/ext/intl/config.m4
+++ b/ext/intl/config.m4

diff --cc ext/intl/config.w32
index 437fedb7d3bc9e445259bb5c764b2d7e9a533c3b,68ccadf2d837af7c0d78dba87f44601caf53b3da..437fedb7d3bc9e445259bb5c764b2d7e9a533c3b
mode 100755,100644..100644
--- 1/ext/intl/config.w32
--- 2/ext/intl/config.w32
+++ b/ext/intl/config.w32

diff --cc ext/intl/dateformat/dateformat_class.c
index a9e06c147d8abdf0daf3275aa253b5736464b6eb,eb3f5f4e7706c7dae653e02b57df2ff331b8f92a..a9e06c147d8abdf0daf3275aa253b5736464b6eb
mode 100755,100644..100644
--- 1/ext/intl/dateformat/dateformat_class.c
--- 2/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c

diff --cc ext/intl/doc/collator_api.php
index ef7250243bfdd951b22516ee27a06dbd07fd2961,5428783750472a68091312a64925a9f437fd5c52..ef7250243bfdd951b22516ee27a06dbd07fd2961
mode 100755,100644..100644
--- 1/ext/intl/doc/collator_api.php
--- 2/ext/intl/doc/collator_api.php
+++ b/ext/intl/doc/collator_api.php

diff --cc ext/intl/doc/common_api.php
index 993dab180b43c052a01f4788072d8e38118d257a,ce2329fe3b817229d5207ff6884f3ef8dd7bbaff..993dab180b43c052a01f4788072d8e38118d257a
mode 100755,100644..100644
--- 1/ext/intl/doc/common_api.php
--- 2/ext/intl/doc/common_api.php
+++ b/ext/intl/doc/common_api.php

diff --cc ext/intl/doc/datefmt_api.php
index 272abdb57c6a2f3507b0d5579e0878c1c2a80ffa,0c5002e281bad6894b5724d629ac57a2e7c3aa2b..272abdb57c6a2f3507b0d5579e0878c1c2a80ffa
mode 100755,100644..100644
--- 1/ext/intl/doc/datefmt_api.php
--- 2/ext/intl/doc/datefmt_api.php
+++ b/ext/intl/doc/datefmt_api.php

diff --cc ext/intl/doc/formatter_api.php
index 14d98db66a8b0ce4758599098dc75e8bd83582b0,754b16c62f70d89fa4befe02781cd30aebfc4955..14d98db66a8b0ce4758599098dc75e8bd83582b0
mode 100755,100644..100644
--- 1/ext/intl/doc/formatter_api.php
--- 2/ext/intl/doc/formatter_api.php
+++ b/ext/intl/doc/formatter_api.php

diff --cc ext/intl/doc/msgfmt_api.php
index e4d047b9790f876a63f55fa0407dcbde403b16ef,5d178f1273a5a3aecac39958effac93ae3283981..e4d047b9790f876a63f55fa0407dcbde403b16ef
mode 100755,100644..100644
--- 1/ext/intl/doc/msgfmt_api.php
--- 2/ext/intl/doc/msgfmt_api.php
+++ b/ext/intl/doc/msgfmt_api.php

diff --cc ext/intl/formatter/formatter_class.c
index 28af14e5dbb33d9d0a354012bc7c832d1517c43e,0bb5894f096b53fae885e097ccad8857252de5a1..28af14e5dbb33d9d0a354012bc7c832d1517c43e
mode 100755,100644..100644
--- 1/ext/intl/formatter/formatter_class.c
--- 2/ext/intl/formatter/formatter_class.c
+++ b/ext/intl/formatter/formatter_class.c

diff --cc ext/intl/grapheme/grapheme_string.c
index 475bbe4184791d1c2828083ec3361f876437ec7a,0b7ecdb27d56e10f7cb520cd1e7614d256ce3b9a..475bbe4184791d1c2828083ec3361f876437ec7a
mode 100755,100644..100644
--- 1/ext/intl/grapheme/grapheme_string.c
--- 2/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c

diff --cc ext/intl/intl_convert.c
index 92cdc4cef41c9a83b4850b861880aeb899d0a7c9,33f17306253f7c07440aa88e255e04a3719f9ead..92cdc4cef41c9a83b4850b861880aeb899d0a7c9
mode 100755,100644..100644
--- 1/ext/intl/intl_convert.c
--- 2/ext/intl/intl_convert.c
+++ b/ext/intl/intl_convert.c

diff --cc ext/intl/locale/locale_class.c
index 432cfb28fce25ef8e8ed5c6b9ab63deacbb5e021,d433bf5839dbd47c2a1d017f1fd00ee63cd6a6ff..432cfb28fce25ef8e8ed5c6b9ab63deacbb5e021
mode 100755,100644..100644
--- 1/ext/intl/locale/locale_class.c
--- 2/ext/intl/locale/locale_class.c
+++ b/ext/intl/locale/locale_class.c

diff --cc ext/intl/msgformat/msgformat_class.c
index 8145a46f175b8faaa9a3dc6f021b96bd810db7b5,7ed28df3dc54caec56bbc8aa4716a44446d61f95..8145a46f175b8faaa9a3dc6f021b96bd810db7b5
mode 100755,100644..100644
--- 1/ext/intl/msgformat/msgformat_class.c
--- 2/ext/intl/msgformat/msgformat_class.c
+++ b/ext/intl/msgformat/msgformat_class.c

diff --cc ext/intl/normalizer/normalizer_class.c
index 154d877e3f59748eb0b2743d3a248876d14b8df7,c5adf781adadd24f5a5bf34afdb0b0fe15e297ee..154d877e3f59748eb0b2743d3a248876d14b8df7
mode 100755,100644..100644
--- 1/ext/intl/normalizer/normalizer_class.c
--- 2/ext/intl/normalizer/normalizer_class.c
+++ b/ext/intl/normalizer/normalizer_class.c

diff --cc ext/intl/normalizer/normalizer_normalize.c
index f46285e9d9174c1ca278211e7420fe4164f8f046,466ab97e12c86afd461903c61abfa1e91f7b2200..f46285e9d9174c1ca278211e7420fe4164f8f046
mode 100755,100644..100644
--- 1/ext/intl/normalizer/normalizer_normalize.c
--- 2/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c

diff --cc ext/intl/php_intl.c
index efe0ddd242319a0803daf045e2f839ce6fdf780a,dc6c0fffa35d610a0c255756912f108a9362af60..efe0ddd242319a0803daf045e2f839ce6fdf780a
mode 100755,100644..100644
--- 1/ext/intl/php_intl.c
--- 2/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c

diff --cc ext/intl/tests/formatter_get_error.phpt
index acb683e894c13ff173219cee2fba8148c7835807,c7b397270959338b7ac2121df91d19dfd7e2963e..acb683e894c13ff173219cee2fba8148c7835807
mode 100755,100644..100644
--- 1/ext/intl/tests/formatter_get_error.phpt
--- 2/ext/intl/tests/formatter_get_error.phpt
+++ b/ext/intl/tests/formatter_get_error.phpt

diff --cc ext/intl/tests/locale_accept.phpt
index cf1dc6e675c6b7ea8abdfd44529e558e839176fb,923571f8f0cc32876def47349dc24ba9c63a148a..cf1dc6e675c6b7ea8abdfd44529e558e839176fb
mode 100755,100644..100644
--- 1/ext/intl/tests/locale_accept.phpt
--- 2/ext/intl/tests/locale_accept.phpt
+++ b/ext/intl/tests/locale_accept.phpt