Bring development and master into sync#1509

renoyjohnm merged 2 commits intodevelopmenttableau/server-client-python:developmentfrom

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