-
wordpress 4.0

update
Merge remote-tracking branch 'origin/master'