Squashed commit of the following:

commit 2a140f84054778cbef75f16ca8c89360ac52ed8a
Author: david <david@kaustik.com>
Date:   Thu Feb 13 08:33:50 2014 +0100

    ingen php