Update for 5.0 branch (include changes from 4.3.5 and 4.3.6, bugfixes)

git-svn-id: https://plugins.svn.wordpress.org/teachpress/branches/5.0.x@922075 b8457f37-d9ea-0310-8a92-e5e31aec5664