Pre-deletion tag of combine_publish_code branch, which I believe was merged into master successfully.
