Updated to make Laravel 4.1 possible