Issue #2 Merge changes from civicrm/wordpress