CONNECT-Solution/CONNECT — pull request #834 by christophermay07 (2014-06-23 17:56:30+00:00)
Title: CONN-1191

Fixed unresolved merge conflicts