Pull PRs from maint/5.2 back into master#844

aaronayres35 merged 2 commits into

masterenthought/enable:masterfrom

pull-prs-from-maint-5.2enthought/enable:pull-prs-from-maint-5.2Copy head branch name to clipboard