Bug 23749 has been merged; w00t!