Updated to development snapshot d069e230a1 for PHP 5.4 compatibility