Merge branch 'apache_err_decoder'