Ditched php 5.3 notice
Merge branch 'GrahamCampbell-patch-3'