Removing .orig files
Merge branch 'feature-wordpress3.9'