Fixed call-time pass-by-reference fatal in PHP 5.4 (See note here: http://us3.php.net/manual/en/language.references.pass.php)
Merge branch 'master' of https://github.com/ingjald/draft