Missed two occurances of Revision:
Skip locale dependent test if locale not available
Merge branch 'PHP-5.5'