Test on PHP 5.5.x as well
Merge branch 'master' into parameter-object
Add __wakeup to allow unserialise trick to work