implement pull request #3731 and add tests to fix #3065#5195

amiteitan wants to merge 3 commits intoplotly:mainplotly/plotly.py:mainfrom

amiteitan:devamiteitan/plotly.py:devCopy head branch name to clipboard