facebook fixins
Merge remote-tracking branch 'upstream/master'
facebook id fix
late night phil