Pull in dclark87's changes to 0.3.8 development.