Update eschwab's fork with cajetanus:master

I hope I am doing this right.