madsec/tha-lab_CICP-MOD11 — pull request #1 by ctarwater (2014-10-24 16:51:36+00:00)
Title: Merge with upstream

Pulling in recent changes.