use 'sed -i$BACKUP_SUFFIX' instead of 'sed -i $BACKUP_SUFFIX', so that it works with both BSD and GNU versions of sed
Merge remote-tracking branch 'origin/master'