made kernel compactible with php 5.3
Merge origin/master