Merge branch 'master' of https://github.com/Automattic/Edit-Flow