merge goober. Fixed in c7a45e6fb632324ea046177408f5f0d10d7faa3d.