Fix conflicts between wp-cli branch and issue-49