create locales and re-add test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  create locales and re-add test

Conflicts:
	.travis.yml
Merge branch 'PHP-5.6'

* PHP-5.6:
  create locales and re-add test