Fixes #374 to keep the requirement to PHP 5.4