Fixing merge conflict with feature-wordpress3.9
Merge branch 'feature-wordpress3.9-merge'