Fix “syntax error near unexpected token `fi'” error
Merge commit '6a08168' into develop