Merge pull request #150 from catalyst/travis-build-fix-20201013

Fix Travis CI build failures (whitespace/indent issues) and Moodle.org Code Prechecks against 2020092500.

Author: jwcatau