fix wordpress 4.0 bug
merge