Submitted by: Josh Gilliam Closes PR's: 4429, 4431-4438 PS: He has agreed to submit all contrib fixes back to the original author.