Merge Log trait into Controller for PHP 5.3 compatibility