Post-merge fix-ups of low-pri feedback requests
Merge pull request #80 from heaths/postmerge

Post-merge fix-ups of low-pri feedback requests