407e7f432c
Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.