Core update (better PHP 5.3 support)