fix MD 5 issue, needs a more complete check
Merge remote-tracking branch 'origin/master'