Getting in all changes from master

[manodeep]

This DDsmu branch will be the basis for the v2.1.0 release

[astropy-bot[bot]]

Hi there @manodeep :wave: - thanks for the pull request! I'm just a friendly :robot: that checks for issues related to the changelog and making sure that this pull request is milestoned and labeled correctly. This is mainly intended for the maintainers, so if you are not a maintainer you can ignore this, and a maintainer will let you know if any action is required on your part :smiley:.

I noticed the following issues with this pull request:

• The milestone has not been set (this can only be set by a maintainer)
• Changelog entry not present (or pull request number missing) and neither the Affects-dev nor the no-changelog-entry-needed label are set

Would it be possible to fix these? Thanks!

If there are any issues with this message, please report them here.

[manodeep]

arghh too many conflicts to resolve on the web. Will do locally