switched from https to ssh connection for submodule
Merge remote-tracking branch 'upstream/master'