upgrade to wordpress 3.9.1 #132
Merge branch 'master' into i132