PHP 5.5 compatible
Merge branch '1.0' into tactics/1.0