manually merging changes by totten / kcristiano: https://github.com/civicrm/civicrm-wordpress/commit/60d66235419ea46dc04e03caa96e8e711aa7d5ce