Squashed commit of the following: Author: Michael Wallner <mike@php.net> Author: Michael Wallner <mike@php.net> Author: Michael Wallner <mike@php.net> Author: Michael Wallner <mike@php.net> Author: Michael Wallner <mike@php.net> Author: Michael Wallner <mike@php.net> Author: Michael Wallner <mike@php.net>