PHP 5.6 breaks the the unserialize() hack
Merge branch '2.0' into 2.1