RFD 12: update to current state
RFD 12: update to current state

davepacheco/rfd,rmustacc/rfd,joyent/rfd,melloc/rfd,davepacheco/rfd,davepacheco/rfd,joyent/rfd,melloc/rfd,joyent/rfd,melloc/rfd,davepacheco/rfd,rmustacc/rfd,AnthonyMann/rfd,davepacheco/rfd,AnthonyMann/rfd,joyent/rfd