Pull request to myself (pramttl) to sync changes to osuosl:develop

Request to pull in latest changes from osuosl:develop to pramttl:develop.