7.x 1.3

Submitting cleanup for release.