CONNECT-Solution/CONNECT — pull request #824 by christophermay07 (2014-06-13 16:09:45+00:00)
Title: CONN-1161 & CONN-729

Resolved more issues found during QA of CONN-1161 and CONN-729, and a bit more code cleanup.