Merging branch/develop into trunk.
Merge pull request #1 from Automattic/master

Merging branch/develop into trunk.