Merge in Twilio fix and some Facebook fixes.