The unserialize() is only broken in PHP 5.4.29 and PHP 5.5.13
Merge branch '2.0' into 2.1