ets-berkeley-edu/calcentral — pull request #1396 by christianv (2013-08-08 01:36:33+00:00)
Title: https://jira.media.berkeley.edu/jira/browse/CLC-2261

Also included the fix for CLC-2151 - #1395
Otherwise we would have had merge conflicts