El update master

I was curious if we were out of date with the source.

This is the merge with the original source.  Don't know if we want to merge it or not, but I figured I'd put the PR out there and see what people say.