Merge remote-tracking branch 'origin/develop'
bug - do not update credentials if undefined in options
Merge remote-tracking branch 'origin/master' into develop