Staging has been merged, so this bug can be closed now.