This should've been committed yesterday...
Merge fixed.