Merge pull request #6439 from remitamine/facebook