Preparation for the upcoming Laravel 5. Fixes #29
Merge remote-tracking branch 'upstream/develop' into develop