added source-directory param
Merge remote-tracking branch 'official/master'
Merge remote-tracking branch 'upstream/master'