CONNECT-Solution/CONNECT — pull request #833 by christophermay07 (2014-06-23 15:40:57+00:00)
Title: CONN-1191

Merging CONN-1207 onto the previous merge effort for CONN-1191