Merge "Fixed http_build_query warnings on PHP < 5.4"