fixed missed if nothing to be done
Merge remote-tracking branch 'upstream/master'