Done (merged, actually; I always confuse myself with rebase).