Another 5.4 Bugfix

Should’ve spotted this one. Oops! Also added PHP5.6 to the test list.