Initial merge with WP 3.9.1
Merge remote-tracking branch 'origin/master' into latest