WordPress 4.0
Merge branch 'release/1.0'