Merge robbyrussel's with my fork.