Changed one error_log() to echo().
Merge branch 'dev' into test