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

Pulling in recent changes.