Connect issue
#171

rylorin wants to merge connect-issue into master

We do not currently have an analysis of these two commits