Backport PR #786 and update changelog#787

rahulporuri merged 2 commits into

maint/5.0enthought/chaco:maint/5.0from

backport-786enthought/chaco:backport-786Copy head branch name to clipboard