Merge from Sandbox facebook-login branch