<div dir="ltr"><div class="gmail_extra">Merged, thanks Christian.
</div><div class="gmail_extra"><br></div><div class="gmail_extra">John -- feel free to resubmit v2 of that branch when you're ready.</div></div>