Merge release -> master for release-2016-10-12
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.
