Merge pull request #1899 from rubenk/python-fixes-for-interactive-sessions