Merge uconn-1 conflict:
extensions/wikia/FacebookClient/FacebookClient.class.php