Added PHP 5.5 to travis testing list.
Merge branch '1.5' into 1.6