Bring development branch up to date with master#1425

jacalata merged 3 commits intodevelopmenttableau/server-client-python:developmentfrom

mastertableau/server-client-python:masterCopy head branch name to clipboard