Removing circular reference issue on Facebook
Merge branch 'master' into gh-pages