add ::error(\Exception $e, ...
Merge remote-tracking branch 'origin/master'