Issue #2 Merge changes from civicrm/wordpress

PR to merge changes from civicrm-wordpress.