fix php 5.4
merged
Merge branch 'mcdir-master'
clear db