Merged, let me know if your pull gets accepted at php.js, to not lose this when updating.