marklogic/roxy — pull request #320 by dmcassel (2014-12-10 14:18:15+00:00)
Title: #317 reversing PR #318, as it incorrectly went to the master branch

I'll re-apply this change to dev