Commit derp fix
Merge from upstream.