[IMPORTANT] apparently Blackboard varies the amount of spacing here
Merge branch 'master' into fp