PHP 5.4 Compatibility (Array To String Conversion Notice)

Merged code from SS3.0 branch to get rid of an instance of the "Array
To String Conversion Notice".