Upstream changes from feed branch, getting them in here so they can be localized in advance of merge (bug 1055851).
Merge pull request #584 from chuckharmston/1055851_master

Upstream changes from feed branch, getting them in here so they can be localized in advance of merge (bug 1055851).