PHP5.3 compatible, nothing else changed. See prev. commit