WordPress 3.8

@smarterclayton Please review and merge