Merge "FormatJson: Remove PHP 5.3 compatibility code"