Merged latest master from upstream

Thanks @twilio !