Merge branch 'master' of https://github.com/dgt41/facebookfix