Merge remote-tracking branch 'msimerson/connect' Conflicts: plugins/async/require_resolvable_fromhost plugins/require_resolvable_fromhost
Merge remote-tracking branch 'msimerson/connect' Conflicts: plugins/async/require_resolvable_fromhost plugins/require_resolvable_fromhost