Update Merge pull request #1 from spyder-ide/master

[juejung]

Update from upstream

Before submitting your pull request be sure that:

1. You haven't touched any file in the spyder/defaults directory.

• There is absolutely no need to touch those files.
• If you want to add new configuration options, please go to
  spyder/config/main.py.

2. You haven't eliminated unnecessary blank lines or spaces during your work.
   That makes our reviewing work harder and it could introduce unnecessary
   conflicts with other pull requests.
3. You haven't added new icons to Spyder. Please leave decisions about what
   icons to use to us :)

---

Note: You can safely remove this text before submitting your work.

[ccordoba12]

@juejung, do you need help to submit a pull request for Spyder?

Unfortunately, this pull request is empty...

[juejung]

@ccordoba12 my apologies. @rlaverde asked me to test the changes in #4846 which fixes #4841 and I must have pressed the wrong button in Github (I'm new to this). I can confirm that #4846 fixes the issue in #4841 which I originally raised in #4316.
This one, #4848, was just done by accident and can be deleted. Sorry again for any confusion.

[ccordoba12]

Ok, no problem. Thanks for helping @rlaverde to test that his PR really fixes your problem.