edx/edx-platform — pull request #6378 by singingwolfboy (2014-12-24 19:30:49+00:00)
Title: Mako safe-by-default

This is simply #4576 rebased onto the latest version of master.