0.9 - merge from master

Still needs a fix from #341 to make the apache dates with subseconds to show up in the right year.

Going to work on that next. Just documenting this to prevent duplicate work on a merge.