sync with hashicorop/terraform master