Master to Develop

This merge of master into develop contains a couple of hotfixes that were in master and didn't get pulled to develop individually

- The rename course bug with Past Answers
- Pull #301
- Pull #302
- Pull #283