gemini-hlsw/ocs — pull request #138 by sraaphorst (2014-12-03 12:52:43+00:00)
Title: REL-1866

Updating develop.